From: Alessandro Bono <alessandro.bono369@gmail.com>
Date: Mon, 8 Aug 2022 10:29:47 +0000 (+0200)
Subject: gdmUtil: Fix ShellUserVerifier retry logic
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~461^2^2~113
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=20c84bf9a6d6c345c8c1b42cc9647d57464062be;p=gnome-shell.git

gdmUtil: Fix ShellUserVerifier retry logic

Don't call the _retry() function if we are done trying.

Fallout from 8cfd4c969ba5e8126234585b1656d905266299dd.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2412>
---

diff --git a/js/gdm/util.js b/js/gdm/util.js
index 006841f45..22cbe4733 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -719,10 +719,10 @@ var ShellUserVerifier = class extends Signals.EventEmitter {
                 this._disconnectSignals();
                 await this._handlePendingMessages();
                 this._cancelAndReset();
+            } else {
+                await this._handlePendingMessages();
+                this._retry(serviceName);
             }
-
-            await this._handlePendingMessages();
-            this._retry(serviceName);
         } catch (e) {
             if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
                 logError(e);